Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 07:35:06 +0000 (07:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 07:35:06 +0000 (07:35 +0000)

Trivial merge